merge commits from branch