Remove conflict comment