users tests all pass
resolved merge conflicts