clean
refactoring separtion of objects with db
refactor parsing
implement simple conflict solving
add Random class