1 files changed, 5 insertions, 1 deletions

diff --git a/README.md b/README.md
index 0ac465e..e77723f 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
-# fminfunctions
\ No newline at end of file
+<<<<<<< HEAD
+# fminfunctions
+=======
+# intfminfunction
+>>>>>>> de5fe502b7240a48f9d46b9e210060de5c2b185e