Fixed merge

Nor learned the merging yet. Fixed it manually. :)