fix conflict stupid
Merge pull request #12 from baraabourghli/enhance_ui

fix conflict stupid