Remove conflict markers in JavaDocs