When did the AFL-NFL merger fully take effect?