working on implementing the algo
Fixed Conflicts