repaired Turk debugging window at the end
conflict resolution
merge conflicts