fix conflict
set up static generation