Could you fix this merge comment, please?