fix DESCRIPTION after merge