docx xml styles update
conflick resolved