deleting useless list from styleguide
solving conflicts