#conflict_add and #conflict_get now also use hashes.

Also renamed #conflict_at back to #conflict_get and updated some docs.