Test merge branches 2