Fixing the merge stuff