fixing my rebase problems