fix some rebase errors

faf.exe were removed in #91fb1404b2b5c7b7ae5353e51fa4dc597e4a31dc

fixed some files