[BUGFIX] Invalid cross-link references and merge conflict