diff --git a/.gitignore b/.gitignore
index 7253177..b993c28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,11 @@ ebin
 rel/example_project
 .concrete/DEV_MODE
 .rebar
+<<<<<<< HEAD
 _build/
 # ---> Intellij
 .idea/
-*.iml
\ No newline at end of file
+*.iml
+=======
+
+>>>>>>> d5d23078c84af242a5e7b00e131919a6b76f7314
diff --git a/LICENSE b/LICENSE
index ed16ed4..941b444 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Copyright (c) 2017, Fabio Salvini <salvini.fabio001@gmail.com>.
 All rights reserved.
 
@@ -27,3 +28,13 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=======
+MIT License
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+>>>>>>> d5d23078c84af242a5e7b00e131919a6b76f7314
diff --git a/README.md b/README.md
index b784f31..38e01d0 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 log_monitor
 =====
 
@@ -7,3 +8,8 @@ Build
 -----
 
     $ rebar3 compile
+=======
+# log_monitor
+
+Erlang application to monitor multiple log files and be notified when errors occur.
+>>>>>>> d5d23078c84af242a5e7b00e131919a6b76f7314