added splash
merge