Current Git structure
enter image description here

I am creating branch from main and after changing

After release i have merged by brach with main and develop now i have to provide hotfix. I have created branch from main made come chnages in hotfix branch now i am merging this with main develop. The hotfix branch merged with main succefully but when i am merging hotfix with develop i got chnages of two commit ids in one commit the changes are from hotfix and in second commit changes are from last release commit