current 30 solutions
merge conflict