diff --git a/app/models/task_status.rb b/app/models/task_status.rb
index 9a0231b7c22d9f190484c079240de978ee8faa9c..39b8bd252fdbc11fd806fc4a8c03b2fcf6ec61e4 100644
--- a/app/models/task_status.rb
+++ b/app/models/task_status.rb
@@ -1,5 +1,14 @@
 class TaskStatus < ApplicationRecord
   belongs_to :task_category
+
+>>>>>>>>>>>>
+  def set_name
+  end
+============
+  def get_name
+  end
+
+<<<<<<<<<<<<
 end
 
 # == Schema Information