working on merging in meteor work