fixing error from rebase