diff --git a/src/main/java/com/example/demo/app/domain/model/GoalModel.java b/src/main/java/com/example/demo/app/domain/model/GoalModel.java
index 52b3ad7..94a57d2 100644
--- a/src/main/java/com/example/demo/app/domain/model/GoalModel.java
+++ b/src/main/java/com/example/demo/app/domain/model/GoalModel.java
@@ -2,12 +2,9 @@ package com.example.demo.app.domain.model;
 
 import java.time.LocalDate;
 
-<<<<<<< HEAD
 import com.example.demo.app.infra.entity.GoalEntity;
 import com.example.demo.app.presentation.form.GoalForm;
 
-=======
->>>>>>> f955667682040961a972b0107053018dccd41543
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -27,7 +24,6 @@ public class GoalModel {
 
 	private Integer goalComplete;
 
-<<<<<<< HEAD
 	public static GoalModel convertFrom(GoalEntity goalEntity) {
 		return new GoalModel(
 				goalEntity.getGoalId(),
@@ -59,6 +55,4 @@ public class GoalModel {
 				goalForm.getGoalComplete());
 	}
 
-=======
->>>>>>> f955667682040961a972b0107053018dccd41543
 }
\ No newline at end of file