git ignore
main thing
conflict correction
testing upload