merge error fix, return to previous commit if this throws error