had to resolve conflicts