example conflict
merged