Use ASSOC by default
Merge branch 'branch-1'