Fixing the merge