edit readme
resolve conflict