integrate changes from laptop