Revert "resolve merge conflicts"

This reverts commit f82ae76c060f6191caa30b9f8f794cb00689fc5c, reversing
changes made to 02677b38c24a2c93bd879820fce180ea38cad68d.