fixed merge issue that broke the compile assets task