File added in new branch
Create webfile
Added a file that will cause a conflict when merge
Added file on master before merging