mergeStrategy

The action to take when there is a merge conflict.