GUI changes
conflict resolution