this is a test
test
delete test2.c
rename
fix
fi
Merge branch 'test'
fix
Merge remote-tracking branch 'origin/master'