merge into ember cli