fixed deletions after merge