Example change in conflict branch.