resolve conflicts again