Merge dev and dev_database