prepare to merge branch zju