merged stuff
fixed merge bugs