layout design
fix conflict
fix second conflict