transfering work from laptop. I hate manual merges...