Tuesday 4/29 clean copy 9:20am resolved merge conflicts