working on merging changes