ssl fix
confict fix