merging conflicts and other stuff practice