Fixed resource files that were committed with conflicts.