fixed merge errors from rebase