merge issue fixed.