sort of merging branches