better now
fixed merge