resolve merge conflicts of cfeb3c0 to nyc-dev