Fixed merge issue with my code