reformatted dollar amounts
resolved conflcits
reformatted dates