fix merge issues and enable FRANDOM for loganre