updated to merged systemjs