added conflict?
Merge pull request #1 from cdyck/caleb

added conflict?