force conflict resolution with hooks and ten sides
conflict resolution spec depends on allow_mult
Merge pull request #195 from basho/bk-force-conflict-resolution

Fix conflict resolution specs

Reviewed-by: bkerley