about project page styling
resolved conflict