first commit
fix conflic in readme