Issue 90 unable to push html page after fixing conflcits