fix merge conflict
Merge pull request #20 from SamLau95/style_search

fix merge conflict