diff --git a/README.md b/README.md
index 0686a96..4d598a0 100644
--- a/README.md
+++ b/README.md
@@ -29,4 +29,9 @@ You can [fork this repo](https://help.github.com/articles/fork-a-repo/) to creat
 
 ``` bash
 vue init username/repo my-project
-```
+<<<<<<< HEAD
+
+This change was made in the feature branch.
+This change was made in the feature branch.
+=======
+This README contains updates from both master and feature branches
\ No newline at end of file