Rebranch after merge again