Compiles and runs new cpp file
Fixing conflicts again