local commit
edited classes.json
using theirs