styling
resolved conflict
styling some more