resolved merge conflict, and UI changes from this afternoon