Revert "fixing merge conflicts"

This reverts commit a00cad8616d08079e01c2fa544f535cb0a32cee1.