First, resolve any remaining conflicts in your pull request. Look back at step one if you need help.