getting ready for production
fixed merge conflicts