fixes missed merge conflict