isolating user order views
resolved merge conflicts