modify the layoout
solve conflict