fix layout
fix conflit