Again trying to solve merge conflicts, coming from uncompressed css from the last manager theme merge