Removed MergeWeights (Unnecessary) and edited Chi
Fixed merge + conflicts