Added two subroutines in MODULE_CANOPY
Fixed merging conflict