merging in changes from laptop