Example tweak
Fix merge error