Make a conflict to satisfy dictates of lab assignment
Fix merge conflict for lab