conflict resolution
fixing conflicts