Changes to Part B
Fix merge conflicts