remove color
merged conflict