resolved merge conflict and some whitespace fixes