add condition guards to last commit