intended merge conflict
merge conflict resolved