work edits, watched all videos
fixed merge again