Unpacked lab 3 tar files
Hopefully fixed the merge conflicts...