api change
resolve conflicts in index.html