Merge of two laptops' code completed