merge confl