stuff
fixed merge issues