merge conflicts by zhou