diff --git a/db/manifest b/db/manifest
index 6de78a088..d056a385d 100755
--- a/db/manifest
+++ b/db/manifest
@@ -297,7 +297,6 @@ alter_genre_player_unique_constraint.sql
 musician_search.sql
 enhance_band_profile.sql
 alter_band_profile_rate_defaults.sql
-<<<<<<< HEAD
 repair_band_profile.sql
 jam_track_onboarding_enhancements.sql
 jam_track_name_drop_unique.sql
diff --git a/ruby/lib/jam_ruby/models/review.rb b/ruby/lib/jam_ruby/models/review.rb
index 157790e43..7c98619d9 100644
--- a/ruby/lib/jam_ruby/models/review.rb
+++ b/ruby/lib/jam_ruby/models/review.rb
@@ -20,7 +20,6 @@ module JamRuby
 
     after_save :reduce
 
-
     def self.index(options={})
       if options.key?(:include_deleted)
         arel = Review.all
diff --git a/ruby/lib/jam_ruby/models/teacher.rb b/ruby/lib/jam_ruby/models/teacher.rb
index 06ef35e1e..83aac0188 100644
--- a/ruby/lib/jam_ruby/models/teacher.rb
+++ b/ruby/lib/jam_ruby/models/teacher.rb
@@ -12,6 +12,8 @@ module JamRuby
     has_many :experiences_teaching, :class_name => "JamRuby::TeacherExperience", conditions: {experience_type: 'teaching'}
     has_many :experiences_education, :class_name => "JamRuby::TeacherExperience", conditions: {experience_type: 'education'}
     has_many :experiences_award, :class_name => "JamRuby::TeacherExperience", conditions: {experience_type: 'award'}
+    has_many :reviews, :class_name => "JamRuby::Review"
+    has_one  :review_summary, :class_name => "JamRuby::ReviewSummary"
     has_one  :user, :class_name => 'JamRuby::User'
 
     validates :user, :presence => true
diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb
index 3703e2e53..64fccd4f1 100644
--- a/ruby/lib/jam_ruby/models/user.rb
+++ b/ruby/lib/jam_ruby/models/user.rb
@@ -50,7 +50,7 @@ module JamRuby
     has_many :user_authorizations, :class_name => "JamRuby::UserAuthorization"
 
     has_many :reviews, :class_name => "JamRuby::Review"
-    has_many :review_summaries, :class_name => "JamRuby::ReviewSummary"
+    has_one  :review_summary, :class_name => "JamRuby::ReviewSummary"
 
     # calendars (for scheduling NOT in music_session)
     has_many :calendars, :class_name => "JamRuby::Calendar"
diff --git a/web/app/views/api_teachers/detail.rabl b/web/app/views/api_teachers/detail.rabl
index 17570bb39..dea496ff2 100644
--- a/web/app/views/api_teachers/detail.rabl
+++ b/web/app/views/api_teachers/detail.rabl
@@ -34,6 +34,23 @@ attributes  :id,
             :years_teaching,
             :errors
 
+node :review_summary do |teacher|
+  {
+    avg_rating: avg_rating,
+    wilson_score:wilson_score,
+    review_count:review_count
+  }
+end
+
+child :recent_reviews => :recent_reviews do
+  attributes :description, :rating
+
+  child(:user => :user) {
+      attributes :id, :first_name, :last_name, :name, :photo_url
+    }
+end
+
+
 
 node :instruments do |teacher|
   teacher.instruments.collect{|o|o.id}