removed finish
fixed merge