Resolve conflicts problem