Merit aid shifting to need based aid

Merit based awards are a type of FA.