a36abf
- Fix some merging breakages that caused the package not to build. VS: ----------------------------------------------------------------------