diff --git a/Dockerfile b/Dockerfile
index bbe1149..37ae98b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,10 @@
 FROM alpine:latest
+<<<<<<< HEAD
 RUN apk add --no-cache python3 py3-pip nano curl
 
-ENTRYPOINT [ "nano" ]
\ No newline at end of file
+ENTRYPOINT [ "nano" ]
+=======
+RUN apk add --no-cache python3 py3-pip nano curl
+RUN curl https://raw.githubusercontent.com/scopatz/nanorc/master/install.sh | sh
+ENTRYPOINT [ "nano" ]
+>>>>>>> f33ef8703131441ef30407f97c5f79b85a74dd80