This conversation needs to be resolved before I can merge.