* remove the conflicted comment.