MergeApp Learning to deal with merges Step 1 will be to add a collaborator Step 2 have the other person pull down Step 3 both people will change something on the same line Step 4 other person will push Step 5 pull down to see merge conflict