acpt: update two-ways merge scenario and steps