Unconflict merge