Revert "Clean up conflicts"

This reverts commit 0dfaa48afc445d3d396cf622498645804bd47f3d.