Add: design update
Fix: merge conflict