A little more explanation of resolving merge conflicts