Revert "resolve conflicts"

This reverts commit 826628a3e8e7a329fabd869a4027b58296a0ae94.