feature B change
manual merge resolved