modificat styles
confilcts resolved