Removed seeds.rb from git tracking
fixed merge conflicts?