got rid of merge mark