add the merge option to the fix-workspace