commit w conflict
conflict untangled
Merge pull request #3 from michaeltirenin/master

Printline conflict