Harsh Harshvardhan Shrivastava Added this line on github and Now lets create a conflict because I am the Coder. Added this line one a branch. Not on Master. Ooh, you resolved a conflict. Good now what if you are on a branch.