small changes
fixed merge