Add git merge conflict resolution draft
Publish git merge conflict post