edited merge