Fixed merge conflict
Changed comment to be in confession hashmap