[NOBTS] Resolve merge issue