All Measurements in Output Directory
Some merge conflict resolution