diff --git a/README.md b/README.md index aa1cace..8207416 100644 --- a/README.md +++ b/README.md @@ -117,3 +117,10 @@ case 'rtf': ## Roadmap - Remove ignored linting rules and fix them +<<<<<<< HEAD +This line is added in feature branch for merge conflict experiment. +======= +This line is added in master branch for merge conflict experiment. + + +