Fixed Merge issue