Merge "Fix: 'internal server error' when pushing the same commit twice"