Merge and upgrade again?