Revert "Moar conflicts?"

This reverts commit 78809d52f469175ebedcf5940ebb5827718d8e89.