aap internal conflict

close