Only include mods in include.txt in conflict resolution

Previously, include.txt only specified mods to install
Include vanilla in conflict resolution

It is kind of important..