merging changes, precompiling assets