merge fixes
the real ssao