Edited merge conflicts