merge fei