background palette introduced
merged conflicts