changed layout
resolved conflicts