You have just completed rebasing your master branch and need to manually update the remote master, even though there is a merge conflict. How can you accomplish this?