merge in nyc-release history after reset to master