working copy disparities
removed sqlite db and log temporarily to fix merge conflict
re-added files