Merge conflict resolved -- gait corrected --video generated