laptop version for merge
changes