Initial commit
Create b.txt
solving conflict