Add missing conflict setting for Riak 1.4.10