Fixed an issue with the merge