fixed merge garbage