Removed unnoticed merge error.