edit readme file
readme conflict