Undoing merge error + DAO revert