resolve conflict thesis.tex used mine
resolve conflict thesis.tex used theirs