Making tests pass.....
Fixed Merge