Trying to solve merge conflict on vagrant config.

vagrant/manifests/site.pp

@@ -0,0 +1,37 @@
+# Class: site
+#
+#
+class site
+{
+  $login    = "Admin"
+  $email    = "admin@example.com"
+  $password = "password"
+
+  class { "python":
+    version    => "system",
+    pip        => true,
+    dev        => true,
+    virtualenv => false,
+    gunicorn   => false
+  } ->
+
+  python::requirements { "/vagrant/requirements.txt":
+    owner      => "root"
+  } ->
+
+  exec { "startmisago":
+    command => "python manage.py startmisago",
+    path    => "/usr/bin:/usr/sbin:/bin:/usr/local/bin",
+    cwd     => "/vagrant"
+  } ->
+
+  exec { "adduser":
+    command => "python manage.py adduser ${login} ${email} ${password} --admin \
+               && /bin/echo 'admin_user_created' >> /etc/puppet/puppet_history",
+    unless  => "/bin/grep 'admin_user_created' /etc/puppet/puppet_history",
+    path    => "/usr/bin:/usr/sbin:/bin:/usr/local/bin",
+    cwd     => "/vagrant"
+  }
+}
+
+include site