Added text to empty file
Made changes to file to create a branch/master code conflict
Removed conflicting text to merge branch with master