Fixes Merge issue