Some resolve (6/30)

Some resolve