Revert "fix some conflicts"

This reverts commit ce13075750ca973a0c218489b5c1091e147d6e58.
Revert "fix some conflicts"

This reverts commit 984d5ef8bfe820fde78da02b9e8b1b716bac04fb.
fix some conflicts