began merging branches