resolve conflicts with dep.