fixed git orders
fix git commits and errors