conflicts resolved in css scripts and index