Merge two commits with TrinityCoreg