fix merge errors from rebase