Change on branch experiment.
Commit line in conflict with branch experiment.
Merge branch 'experiment' adding both conflict lines.