t3504: do check for conflict marker after failed cherry-pick