Remove conflict weirdness

also removing force.ssl false from dev config