removed conflict in db yml