try layout
fix confict