Fixed merge conflicts in resource model - Aug 24