fix automerge
fix this
fix context tests
changes tracker and conversion split
refactored some composition and added required components
more refactoring
fix dictionary problem