adding README
fixing merge conflicts