Merge Conflict
Merge conflict resolved
Working on master
Second merge conflict resolved