update style and fix conflict resource ids