synch up resolver file with schema cleanup changes Will just made