promotion fixed + merge