changes merged and ready