fixed merge trouble