Fixing conflicts and removing a few sections