adapted api changes
Resolve Merge Conflicts