Fixed merge conflicts
Regenerate rc files