novo layout
resolved conflict