added feature1 to readme
added fix1
added fix1
fixing conflict