Resolu le merge