fixed httpsEnforce
merging