resolve conflict
edit readme file