diff --git a/.gitignore b/.gitignore
index 5f2371b..96a3685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,4 @@
-<<<<<<< HEAD
-
-lintools/testdata/.DS_Store
-=======
-# OS generated files #
-######################
-/lintools/.DS_Store
-
+.DS_Store
 lintools/topol.ipynb
 Dockerfile
 *.pyc
->>>>>>> 21d76e036ac3874177a134ff9aa8b34f5c40f793
diff --git a/lintools/analysis/__init__.pyc b/lintools/analysis/__init__.pyc
deleted file mode 100644
index d807572..0000000
Binary files a/lintools/analysis/__init__.pyc and /dev/null differ
diff --git a/lintools/analysis/hbonds.pyc b/lintools/analysis/hbonds.pyc
deleted file mode 100644
index 94594e0..0000000
Binary files a/lintools/analysis/hbonds.pyc and /dev/null differ
diff --git a/lintools/analysis/residence_time.pyc b/lintools/analysis/residence_time.pyc
deleted file mode 100644
index dc7822d..0000000
Binary files a/lintools/analysis/residence_time.pyc and /dev/null differ
diff --git a/lintools/data.pyc b/lintools/data.pyc
deleted file mode 100644
index 85c3aa2..0000000
Binary files a/lintools/data.pyc and /dev/null differ
diff --git a/lintools/figure.pyc b/lintools/figure.pyc
deleted file mode 100644
index 6bb977f..0000000
Binary files a/lintools/figure.pyc and /dev/null differ
diff --git a/lintools/molecule.pyc b/lintools/molecule.pyc
deleted file mode 100644
index 06070e4..0000000
Binary files a/lintools/molecule.pyc and /dev/null differ
diff --git a/lintools/plots.pyc b/lintools/plots.pyc
deleted file mode 100644
index 7056e6a..0000000
Binary files a/lintools/plots.pyc and /dev/null differ
diff --git a/lintools/testdata/.DS_Store b/lintools/testdata/.DS_Store
deleted file mode 100755
index 7e6412e..0000000
Binary files a/lintools/testdata/.DS_Store and /dev/null differ