Show a failure of rebase -p if the merge had a conflict