fixed merge message