updated metrics from merging conflicts