merge with Bao