Created a layout with skeleton
Resolved conflicts