up bin
fixed merge