Merge pull request #828 from richardmtl/conflicting-og-cleanup

Conflicting og cleanup and alpha sort