test resolve conflicts

resolve conflics