merge local changes