I have made a commit that is local on my laptop
I have resolved the merge conflict on my local computer