Hopeful revert to fix column conflicts