Fixed merge issue