add readme
fix page
prepare for merge
fix failed merge