end of 7 and beginning of 8
resolved merge conflict