Fixed file compiler errors

Got rid of silly MERGE messages