changed layout
conflict resolved