(bug) creating merge conflict
Merge pull request #13 from celineotter/addConflict

(bug) creating merge conflict