Testing merge conflicts