helloGitCommitDoneQuick
second commit, but this one will stick
Nobody likes a merge conflict. Nobody.
noConflict