Remove Merge Conflict from file comment