Resolve Merge Conflicts
# Start on master branch git fetch origin master git checkout feature/branch-name git merge FETCH_HEAD