Fixed merge issue in file