changed comments
fixed merge conflict in village.rb