Finished merge conflicts