Undo merge with Arjun's placeholder