my first commit
README Conflict fix