remains of the merge removed