design
fixed merge conflict
design fixes
added my packages
fix merge conflict