Added percentage display / Resolved conflicts.