made a change
made other changes by switchig branch from testing to master
task of hotfix branch is completed
hotfix branch is deleted and moved to merge
merge conflict is solved