noConflict branch
Merge pull request #1 from reggi/noConflict

noConflict branch