fixed conflicts, add simplecov to env.rb