creating conflicts
conflict on my master branch
solved and merged conflicts