Fixing issues in the merge