add aa
handle conflict