Added ours and theirs for merging
Set the default diff algorithm to patience