Creating a file for conflict in master branch