fixed glens rogue merge