Switch CONFLICT_IGNORE to CONFLICT_REPLACE.
Merge branch 'master' into caching_inval_fix_i80