Revert "Conflicts"

This reverts commit 3acca5b514e2b53f28a7ee4e703375963c6e92dd.