Changed showed values
Merging conflict resolved