Fix a merge and a comment