switched to angular instead of ember. works
merge conflict fix