updated to latest Dart API
fixed merge conflict