add LICENSE, too
tests and some better conflict/error handling