Fixed conflicts in resource files introduced by another developer.