again fixing rebase stuff (again me=stupid)