backend complete
resolved merge conflicts