1 files changed, 1 insertions, 5 deletions

diff --git a/README.md b/README.md
index e77723f..a71e086 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1 @@
-<<<<<<< HEAD
-# fminfunctions
-=======
-# intfminfunction
->>>>>>> de5fe502b7240a48f9d46b9e210060de5c2b185e
+intfminfunction