Fix some clashing symbol numbers due to merge conflict