Obscure error during merge corrected.