basic cleanup
resolved merge conflict