resolved the issue
master-commit
Merge branch 'issue'
deleted everything
test
test
merge?
deleted some files
commit before branch
added a line in branch 1
added in master
Merge branch 'b1'
merged the two branches
Conflicts:
	file
asdfasf
asdf
asdf
asdf
as
df
asd
fasdf
sd
f