Average functions, tests, merge conflicts.