working on merging