Creating a file for conflict
Creating a file for conflict
Creating a file for conflict
Creating a file for conflict
Fixed the merge conflict with master branch