fixed splash
merge