Workspace preferences
Merge conflicts
Correct merge conflicts