diff --git a/.gitignore b/.gitignore
index b2d7bbf988d665ea906815f3c6e84c94c628f08a..258f9ef9620eddc1341b7e2c51e72deb7596b6ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,9 +17,5 @@ Rplots.pdf
 .nfs*
 *.RData
 !data/*.RData
-<<<<<<< HEAD
-.Rproj.user/
-
-=======
 .Rproj.user
->>>>>>> d82bd2503734b41ca8f7bdd66deb934c3b202f03
+*.Rproj
diff --git a/cstools.Rproj b/cstools.Rproj
deleted file mode 100644
index 21a4da087e1c026c953a49de88caea1247cd1f1b..0000000000000000000000000000000000000000
--- a/cstools.Rproj
+++ /dev/null
@@ -1,17 +0,0 @@
-Version: 1.0
-
-RestoreWorkspace: Default
-SaveWorkspace: Default
-AlwaysSaveHistory: Default
-
-EnableCodeIndexing: Yes
-UseSpacesForTab: Yes
-NumSpacesForTab: 2
-Encoding: UTF-8
-
-RnwWeave: Sweave
-LaTeX: pdfLaTeX
-
-BuildType: Package
-PackageUseDevtools: Yes
-PackageInstallArgs: --no-multiarch --with-keep.source