Fix mergin