former changes
merging example