Cheng Fixed a conflict

fixed a conflict