one more merge issue now resolved.