initial commit
resolve conflict in README