Resolving syntax errors brought by merge conflicts
Ignoring intermediate files