You have been repaid the time investment spent learning rebase commands, after once being able to avoid a really bad merge conflict.