Manual merge

Merging manually because I'm having issues with the git terminal.