2 bugs
fixed merge