better factionrelation-retrival
merge with master