changeB
merged after conflicts