Wrap the conflict in 'set +e' so script can continue in error so I can see git diff output