Initial commit
Create a.txt
solving conflict