fixed description
reconciled merge