Project resolve (19/35)

Project resolve