cat design
merging
fixed the conflicts