changed color to pink
merged color conflict