add skylight
compile those assets
fix merge conflict