modified citizen.rb
tetsuya citizun first
citizen's conflict merged