diff --git a/README.md b/README.md
index ab257fc..60fd109 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,5 @@
 ##Forgotten line
 ## HOTFIX
 ## Changes to send to remote
+
+## Resolving conflict in README.md
\ No newline at end of file
diff --git a/SimpleCommit.txt b/SimpleCommit.txt
index ba7f5d1..93ddb44 100644
--- a/SimpleCommit.txt
+++ b/SimpleCommit.txt
@@ -1,2 +1,4 @@
 Pruvet :)
 Hi)how are you?
+
+I'm fine, thx. Hope you too :)
\ No newline at end of file