fixing merge
new layout