Remove conflict markers from edit page