local changes
resolve conflicts
Merge remote-tracking branch 'upstream/master'
printable form
ignore build products
stuff