database create script
solve conflict MainActivity