resolve conflicts

resolve some conflicts