Revert "Fix conflicts"

This reverts commit 3268dc90f7d8a3466b828e5e6399ea964c239582.