well, merge or rebase isn't the issue here