save
add color change
Get rid of deletions
fix conflict