Catching up commits due to error on previous commit