Update merge conflict resolution aliases

-gmat => gcot
-gmao => gcoo