add molokai
merge