checking in prod settings
fix
added tests
fix merge