Set conflict manager to strict: no conflicts are allowed
Merge branch 'feature/conflict-management'