Can now read files and find errors
Fixed conflicts