merge conflict fixed and edit readme