purple color and photos
fix merge
fix merge