Committing output files
Ignoring merge conflicts
Colors