fix error made in previous rebase merge conflict