merge conflicts in new workspase