update readme file
solved conflict