resolved merge conflicts. now it just needs to be restyled