database class changed & merge