Actually merged the project files.