fixed returning
fixed merge