Fix Merge

* Well what do you know, there actually was an error. I thought it was just a typical new file creation error like usual...

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>