Update to reflect grant model changes
Fix conflict