Fix precompiled asset merge conflicts