fix conflicts
Merge pull request #1 from Gava97/patch-1

fix conflicts