conflict.js - add a test for 'resolve' with multiple conflicts