modify resolve conflicts