FIX: handle template.js conflict