Update example
Fix merge conflict