Rebranch after merge