Fixed default DB.
Fix conflicts