Bison ready for merge