ok merge all