Fix lots of merge conflicts