Fix duplicate entries when merges don't conflict.