Measurements
Solved merge conflicts