merge
fixed ffap dir