fixed merge settings