Cart Empty Layout
Fix auto merge