fixed import for graphical overwrite conflict resolution