Add algorithms
Fixed conflict
Clean code