broken stuff
fixed conflict in buffer.h