clean up styles.xml
merge changes