fix conflict
start "about" section