conflict error fix
Merge branch 'choigoon' of https://github.com/Family-of-loves/Android into choigoon
DB Using