flea stuff
fixed merge errors