lab3: this is the merge conflict push
Fixed commit errors for Lab3