initial
merge
fixed deps