some work on merging in