Fixed conflicting file headers.