Fixe config merging and assets dir copy