diff --git a/1.sources/MyHealth/src/jpa/VisitJPA.java b/1.sources/MyHealth/src/jpa/VisitJPA.java
index 47f8f20..7d9b35c 100644
--- a/1.sources/MyHealth/src/jpa/VisitJPA.java
+++ b/1.sources/MyHealth/src/jpa/VisitJPA.java
@@ -104,85 +104,3 @@ public class VisitJPA implements Serializable {
 		this.patient=pat;
 	}
 }
-=======
-package jpa;
-
-import java.io.Serializable;
-import java.sql.Time;
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
- *
- */
-@Entity
-@Table(name = "MyHealth.Visit")
-public class VisitJPA implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	private Integer id;
-	private Date date;
-	private Time time;
-	private String observations;
-	private String result;
-
-	/**
-	 * Class constructor methods
-	 */
-	public VisitJPA() {
-		super();
-	}
-
-	public VisitJPA(Integer id, Date date, Time time, String observations, String result) {
-		this.id = id;
-		this.date=date;
-		this.time = time;
-		this.observations = observations;
-		this.result = result;
-	}
-
-	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer value) {
-		this.id = value;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date value) {
-		this.date = value;
-	}
-
-	public Time getTime() {
-		return time;
-	}
-
-	public void setTime(Time value) {
-		this.time = value;
-	}
-
-	public String getObservations() {
-		return observations;
-	}
-
-	public void setObservations(String observation) {
-		this.observations = observations;
-	}
-
-}
->>>>>>> branch 'master' of http://pdp-pds.eimt.uoc.edu/pds19-grupo2/myhealth.git