fix merge conflict! also, level 2 updated + level 3 flowed