fixing dima's inability to merge things