worked on ember integration
merge conflict