didn't actually resolve conflicts - done now