much changes
bump version; update readme
resolve conflicts