fixed another clash
Merge pull request #59 from elyotli/front-end

fixed another clash