fix merge conflict
styles