Hopefully fix bug for part 2
Fix merge conflicts