updated layout
updated conflicts and layouts