harvest source form
fix merge issue