zapadlo dd
solve merge conflict