Merge issue should be solved

hi guys