Updated DESCRIPTION to take care of merge issue