Stories by merge-conflict