Merge conflict resolution. rdlarkins