[dev] Undoing merge operations