merge example
merge conflict fixed