resolve conflicting declarations
Merge pull request #3 from smanders/conflicting_decl

resolve conflicting declarations