准备merge