Add rough responsive
Merge conflict resolution index and layout