merging ember
ember client