Fixed some merge errors
Removed is_a? from env.rb