edited readme file
readme update
resolved readme conflict