Combined the two yaml files and removed one of them