get rid of merge error markers