resolved problems
merge