Manually edited merge conflicts