Auto Comment Merge Conflict