manual merge that went sideways. closes #84