resolved conflicts with integration css and index