Remove old, accidentally committed conflict markers