Added api for angular to bind
Fix merge conflict