diff --git a/app/models/performance.rb.orig b/app/models/performance.rb.orig
deleted file mode 100644
index 772aaf0..0000000
--- a/app/models/performance.rb.orig
+++ /dev/null
@@ -1,14 +0,0 @@
-class Performance < ActiveRecord::Base
-  attr_accessible :comments, :date_submitted, :reviewer, :score
-  belongs_to :user  
-  
-  def reviewer_name
-<<<<<<< HEAD
-    u = User.find_by_id(self.reviewer)
-    u.full_name if u.respond_to?('full_name')
-=======
-   u = User.find_by_id(self.reviewer)
-   u.full_name if u.respond_to?('fullname')
->>>>>>> 289716b24c7c4a1d72fcf1cf16fdc003e96e728c
-  end
-end