Add alias missed in merge conflict