New colors
Store history
Fix conflicts