Fixed merge. Gotta look at code file.