Fix Margin in Mobile Layout
Fix Merge Conflicts