final version of dissertation
resolved merge conflict