fix merge conflict deletion