adds bison locations but does not use them yet
removes some conflicts