blue and gold
merge conflit