create readme
resolve conflict