Resolve conflicts with new API