quick
fixed merge