Fix conflicting descriptions
Merge branch 'master' of https://github.com/affinitic/templer.affinitic