diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
index 5521c042c..1092cfd45 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
@@ -146,7 +146,6 @@ public class HabitRPGUser extends BaseModel {
         this.profile = profile;
     }
 
-<<<<<<< e956287345a142dd1171f260872d6f1813f43d22
     public ContributorInfo getContributor() {
         return contributor;
     }