data load & more
Fixed merge