merged
solve
merge with gk