fixed rent and return
fixed merge