7b8b4f8fc28e40ef88375cbffe06e3eb28152ee0: Update git merge conflict post

Clarify rebase resolution