setup user company relationship and seed db
fix merge conflict in user.rb