prepare for merge with xing