rebase, resolve conflicts, fix Travis failures