Fix alias.up -> attempt merge after update