Added probability in ground truth
Resolved conflicts