merge code
database added
conflict resolve