Remove conflict-markers in files