Remove wrench dependency
Resolve conflicts