Fixed some issues with the merge