fix logic for merging object schemas within a property#1159

eli-bl wants to merge 6 commits intoopenapi-generators:mainopenapi-generators/openapi-python-client:mainfrom

eli-bl:issue1123-merge-modeleli-bl/openapi-python-client:issue1123-merge-modelCopy head branch name to clipboard