added agreement
reconciled more conflicts