90% done with resource chart
fixing merge