merging work from laptop
merging local changes back into repository