merge with server's css - part II