delete file 3, commit file 4
Merge remote-tracking branch 'origin/master' into test-branch
tilde file 1
add test proj
update proj file
test merge conflict resolution 1