Connor's parts of lab report
Fixed conflicts