test amend, revise readme, add readme
resolve conflicts