Hou Haoxing - 2012-09-12

Add a function array_merge_conversion instead of the original array_merge_recursive