Fixed conflicting files