fixed merge manually