new file newFile.txt
confused
confused2
adding files and pushing them
new folder added
took out folder
removed all files
whatever
Merge branch 'newBranch' of https://github.com/rshihab/edit into localb
testing dynamic changes on branch
Merge branch 'newBranch' of https://github.com/rshihab/edit into localb
aa
fixed conflict