Intermediate commit, merging branches