Creating a file for conflict in master branch
Adding a commit that should execute the merge master to feature automaticlly
Fixed the merge conflict with master branch