Removed stray merge marker.