Fixed evaluation setters... WIP ResWa.
Conflict Resolution