add APC suite
fix merge issue