Cleaned up conflict resolver.
Updated MD5SUM.