merge conflict what if i want a mixture of both options code example Example: git take ours git pull -X theirs