delete all
Merge pull request #3 from webdevkab/creatingconflict

delete all