Revert "Conflicts"

This reverts commit c5d52d6c6b73658b50b67a75e3cabf8fcc8ea4ea.