Revert "Conflicts"

This reverts commit 0f2416ccf163f5c818ab422bda47e3364fffe968.