Fix merge conflict detection for cherry-pick conflict.