Revert "More conflicts"

This reverts commit a5af0b1c7b4d29e023be6c21a478e58ba5f86ef5.