SSA changes and conflict merge