initial commit
resolve LICENSE conflict