Fix a merge issue on style.xml