preparing to merge
merged DESCRIPTION