The only conflict was the addition of two different options at the same place. svn path=/nixos/trunk/; revision=28801