updated layout
conflict resolution