Revert "fixed merge conflicts"

This reverts commit a819545bef616a3a2e369e87c95dc124dd2fa525.