The American Family Association (AFA) has ended its successful boycott of Gap, Old Navy and Banana Republic after Gap, Inc. aired an Old Navy commercial with an unambiguous "Merry Christmas" message over the Thanksgiving weekend.