Revert "Fix Merge Conflicts"

This reverts commit 4994bb2f819da99f190d04a627cfb38ece2c8875.