merge 2 laptop
resolved merge conflict