modified seed
conflicts resolved