initial commit
merge solved