diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5b6a0652566d10360493952aec6d4a4febc77083
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.Rproj.user
+.Rhistory
+.RData
+.Ruserdata
diff --git a/create_mc.R b/create_mc.R
new file mode 100644
index 0000000000000000000000000000000000000000..c72802838fcdbbca42dcfd0821947150e32f471d
--- /dev/null
+++ b/create_mc.R
@@ -0,0 +1,3 @@
+a <- 0
+b <- 1
+c <- 2
diff --git a/create_merge_conflict.Rproj b/create_merge_conflict.Rproj
new file mode 100644
index 0000000000000000000000000000000000000000..8e3c2ebc99e2e337f7d69948b93529a437590b27
--- /dev/null
+++ b/create_merge_conflict.Rproj
@@ -0,0 +1,13 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX