updated introduction with skiils
list styling
fix conflicts