(2) & (3): Oops. The conflicts during the rebase didn't get resolved correctly.