fixing merged file

it broke while merging