rebase bar changed in bar
rebased foo changed in master