When do we merge bug fixes and new functionality