solve merges
solve
bugs fixing