change conflict style to css