diff --git a/.travis.yml b/.travis.yml
index eccad34..a80a9d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,13 @@
 language: java
 jdk:
  - openjdk11
-<<<<<<< HEAD
  
 install: 
  - mvn install -DskipTests
 
 before_script:
-=======
-install: true
-docker:
->>>>>>> 7f3ea4bcd937c2850f91d0acc6685b48fab9d5ad
  - docker build -t puerto-rico .
  
-<<<<<<< HEAD
-#script:
-# - mvn install
-# - mvn exec:javag
-=======
 script:
  - mvn test
- - docker run puerto-rico
->>>>>>> docker
+ - docker run puerto-rico
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 3813707..1808c67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,7 @@
-<<<<<<< HEAD
 FROM openjdk:11-jdk-slim
 
-=======
-FROM maven:3.6.2-jdk-11-slim
->>>>>>> 7f3ea4bcd937c2850f91d0acc6685b48fab9d5ad
 COPY . /home/Puerto-Rico/docker/java
 WORKDIR /home/Puerto-Rico/docker/java
-<<<<<<< HEAD
-RUN mvn package exec:java
-CMD ["start"]
-
-
-=======
 ARG JAR_FILE=/target/PuertoRico-0.1-SNAPSHOT-jar-with-dependencies.jar
 COPY ${JAR_FILE} jeux.jar
 ENTRYPOINT java -jar jeux.jar
->>>>>>> docker