resolved merge conflicts
not used columns are removed