Setting up new layout
merging conflict for layout