--- a/components/conflict/Makefile	Tue Apr 17 00:51:00 2012 -0700
+++ b/components/conflict/Makefile	Tue Apr 17 09:10:45 2012 -0700
@@ -20,18 +20,18 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		conflict
-COMPONENT_VERSION=	20040901
-IPS_COMPONENT_VERSION=	0.2004.9.1
+COMPONENT_VERSION=	20100627
+IPS_COMPONENT_VERSION=	0.2010.6.27
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_PROJECT_URL=	http://invisible-island.net/conflict/conflict.html
-COMPONENT_ARCHIVE_HASH=	sha1:fbf712f55c71c1c7c298609284fae00bdcbcc9c6
+COMPONENT_ARCHIVE_HASH=	sha1:cd81d6586ed360dae201910cf0db82951f380bad
 COMPONENT_ARCHIVE_URL=	ftp://invisible-island.net/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk

--- a/components/conflict/conflict.copyright	Tue Apr 17 00:51:00 2012 -0700
+++ b/components/conflict/conflict.copyright	Tue Apr 17 09:10:45 2012 -0700
@@ -1,4 +1,10 @@
-Copyright 1995, 2004 by Thomas E. Dickey
+---------------------
+- conflict 20100627 -
+---------------------
+
+Oracle Internal Tracking Number 5761
+
+Copyright 1995-2004,2010 by Thomas E. Dickey
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,