some styleshits have been modified
fixing some conflicts