Rest controller and database settings
Rest controller and database config
merge