resolve conflict

resolve conflicts