rename git shortcut to stop conflicts