change conflicting method names
Merge pull request #45 from milafrerichs/shortlinks_fix

change conflicting method names