Edited merge conflict