Update About window to latest version
Conflict resolved.