working on merging code