Revert "Fix merge conflicts"

This reverts commit 494f71132278e2af951b5be60f07396cdc72b977.