WIP on merging and colliding