revert/cherry-pick: work on merge commits as well