commit @master by merging branch2