There is some bug in ember that I am not smart enough to figure out
Merged conflicts