Fix missed merge tags