Fix a small issue with the merge