rebase, resolving conflicts and travis failures