correcting .git merging errors
styles link in three intro