Fixing a lot of merge issues