GUI changes (color)
Conflict resolution