Fix merge issue

Someday I will git with the program...