pull request after resolving conflicts