komagata/lokka — comment on commit 41741eccccd7ac4ce72e6c31c3bc995c27d1c595
File:  line 0
By ayumin:

Hmmm ... I like `consistent` than `conflict_free`.