working version of inbox folder merge
fixed error