fixed a conflict that was not recognized
Merge branch 'hotfix/1.1.1'

fixed a conflict that was not recognized during the merge. It was just in a testcase