Add files to project
Fix conflicts with upstream merge