Adding dbPort to yaml file
Merge conflict