Upd FIPS codes
Fixed merge conflict