fixed conflict in styles.xml