small example update
fix merge conflict