bug found in production switch to master
fix bug in production
Ready to production
resolve conflict merging master and stat