Merge issue fixed