Core - Fixed: Failed authentication not increasing failure count
Core - Fixed: Version file had merge/conflict data