comments bug fixed
styles merge