more updates
fixed merge