resolve merge conflicts of d097869 to nyc-dev