semantics
merge conflict resolved