initial commit
database adapter file
merge fix