Ant solver
Merge conflicts