bagpipe palette updates
fix conflict