re-edit conflict blurb and add in http