license
deal with conflict in README that was preventing an automatic merge