Fixed historyTracker
Fixed merges