Revert "fix conflicts"

This reverts commit 6e3718007afe3b02d78ea919d47902df4bb3aa03.