test multiple merge conflicts