added styling
resolved conflicts