fix conflicts
try fix 2
Fix try3
fix4
test
DB sync
Merge pull request #7 from DaemonAeon/master

DB Sync