scala: Update def
Resolve conflict
javascript: Add template