fix data.yaml from merge conflict

Change-Id: Ie15c953ffacebc61da219a6161720ceaf44fb6ca