Oops: Git rebase led to a duplicated change.