Still merging branches together