diff --git a/roles/mysql/tasks/mysql_server.yml b/roles/mysql/tasks/mysql_server.yml
index 48185732b1a8ddae86342632531da100c520d3d3..4dd030c3c7502c5c15baee6ee21353551c689a90 100644
--- a/roles/mysql/tasks/mysql_server.yml
+++ b/roles/mysql/tasks/mysql_server.yml
@@ -16,14 +16,11 @@
   become: true
   register: mysqldb_confdir_create
 
-<<<<<<< HEAD
 - name: make sure mysql conf directory exists
   file: dest=/etc/mysql/conf.d state=directory
   become: true
   register: mysqldb_confdir_create
 
-=======
->>>>>>> origin/master
 - name: "Starting MySQL"
   service: name={{ sqlServiceName }} state=started enabled=true
   become: true