Merge issue resolved