fix github save flow
resolving merge conflict