add more text
added readme file
creating a merge conglict