created readme file
added file in testing
changed the conflicts