add correct merge and begin working on colors