update layout
fix conflig