modify layout
add data in db
fix conflict