resolved conflicts on merge and committed ongoing work on ember controllers