initial set up
README conflict