fixed merge 3