Civcraft2Import:Conflicts/gotenconflict