colis: first attempt at conflict-freeness.
Before Joachim's remarks.