96cbe4224dc5fabc6aa5ed2f811ac630f619bc4c: Publish git merge conflict post