Copy source code to fix database error
Merge files and fix conflicts