added prototype
database
fixed conflict