merge offline changes