Add EmberScript
Resolve merge conflict