Used Codemode to tidy up files
Fixed Merge conflict
Fixed build issues