adding a readme file
fixing conflicts