Fixing a bug in Conflict Tracker + Make propagate method much simpler