Fixed theme merge, parent theme files now are correctly overridden
Added use case in integration test to avoid regressions