Removed a comment conflict