Attempt to fix bootstrap asset pipelining
Fix merge errors