add confict dialog
Merge branch 'master' of https://github.com/ravjotsingh9/DBLike