working through rebase issues
diff issues