merge issue fixed